build: Don't link against libgtk and libgdk

libgdk is statically linked these days, so if you link against it, all
of its symbols will exist twice: Once in libgtk.so and once in your
binary.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d11ba0c6d5429a1acbd31625e3519818e411b797..d3392275950e81d2a1c02df9a6084f7ad3a2e63d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1586,8 +1586,6 @@ bin_PROGRAMS = \
 gtk4_query_immodules_SOURCES = queryimmodules.c gtkutils.c
 gtk4_query_immodules_LDADD =           \
        libgtk-4.la                             \
-       $(top_builddir)/gdk/libgdk-4.la         \
-       $(top_builddir)/gsk/libgsk-4.la         \
        $(GMODULE_LIBS)                         \
        $(GTK_DEP_LIBS)
 
@@ -1596,30 +1594,23 @@ gtk4_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 
 gtk4_encode_symbolic_svg_SOURCES = encodesymbolic.c
 gtk4_encode_symbolic_svg_LDADD =                       \
+       libgtk-4.la                             \
        $(GDK_PIXBUF_LIBS)                      \
-       $(top_builddir)/gdk/libgdk-4.la         \
-       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk4_builder_tool_SOURCES = gtk-builder-tool.c
 gtk4_builder_tool_LDADD =                      \
        libgtk-4.la                             \
-       $(top_builddir)/gdk/libgdk-4.la         \
-       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk4_query_settings_SOURCES = gtk-query-settings.c
 gtk4_query_settings_LDADD=                     \
        libgtk-4.la                             \
-       $(top_builddir)/gdk/libgdk-4.la         \
-       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk4_launch_SOURCES = gtk-launch.c
 gtk4_launch_LDADD =                            \
        libgtk-4.la                             \
-       $(top_builddir)/gdk/libgdk-4.la         \
-       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 if OS_WIN32

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 064f093ec464a64d6fcd9170d49c26ab48e72e1e..8b7b7468036e41a8837102695b68d1df84c192f6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,8 +17,6 @@ DEPS =
 
 LDADD = \
        $(top_builddir)/gtk/libgtk-4.la \
-       $(top_builddir)/gsk/libgsk-4.la \
-       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(GDK_DEP_LIBS)                 \
        -lm

diff --git a/tests/visuals/Makefile.am b/tests/visuals/Makefile.am
index 43dfa6818e202e0763fee6c28ee6d0ab8fcf272b..ec29539d2682a7a34f8a2e82fd5126c02618d68c 100644 (file)
--- a/tests/visuals/Makefile.am
+++ b/tests/visuals/Makefile.am
@@ -13,7 +13,6 @@ DEPS = \
 
 LDADDS = \
        $(top_builddir)/gtk/libgtk-4.la \
-       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)                 \
        -lm
 

diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 39f1eb7ebaf494c574b4bec4d92913d484335c27..88cd3fdc405929b98ca8f63618299a9ee9ca53ab 100644 (file)
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS =                         \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-       $(top_builddir)/gdk/libgdk-4.la \
        $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 

diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am
index 42bacebed613492e25f63cf399416b25b70a1aa4..87b69d6462882b567c1a2830deb78ed2749c68b1 100644 (file)
--- a/testsuite/a11y/state/Makefile.am
+++ b/testsuite/a11y/state/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS =                           \
         $(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gdk/libgdk-4.la \
         $(top_builddir)/gtk/libgtk-4.la \
         $(GTK_DEP_LIBS)
 

diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
index 61e68d50e6a6734c9e162c0a1260e9801c6ebf54..3a2aecfeda98ada56a6d32b81b4d8211a1173509 100644 (file)
--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@@ -18,7 +18,6 @@ AM_CPPFLAGS =                         \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-       $(top_builddir)/gdk/libgdk-4.la \
        $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 

diff --git a/testsuite/css/nodes/Makefile.am b/testsuite/css/nodes/Makefile.am
index 9c24c2a2df6fb4c2a765c7ddad2f27aa3f4b8739..c65fb250d590323821fb3208501175b0463a4596 100644 (file)
--- a/testsuite/css/nodes/Makefile.am
+++ b/testsuite/css/nodes/Makefile.am
@@ -18,7 +18,6 @@ test_css_nodes_CFLAGS = \
        $(NULL)
 
 test_css_nodes_LDADD = \
-       $(top_builddir)/gdk/libgdk-4.la \
        $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(NULL)

diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index 9f803e6e28cba2d05e9ade1d6b64e876ba796a93..2cc81728f75cd2f7fd6a9859e8409ff8a3c1d681 100644 (file)
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -19,7 +19,6 @@ test_css_parser_CFLAGS = \
                $(GTK_DEP_CFLAGS)
 
 test_css_parser_LDADD = \
-               $(top_builddir)/gdk/libgdk-4.la \
        $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 

diff --git a/testsuite/css/style/Makefile.am b/testsuite/css/style/Makefile.am
index 5340de0abcbc3e58abe7e20d98ae157013b1bf04..56868b5d7419b02671cf5e8ba6b367f5ef34e3b5 100644 (file)
--- a/testsuite/css/style/Makefile.am
+++ b/testsuite/css/style/Makefile.am
@@ -18,7 +18,6 @@ test_css_style_CFLAGS = \
        $(NULL)
 
 test_css_style_LDADD = \
-        $(top_builddir)/gdk/libgdk-4.la \
         $(top_builddir)/gtk/libgtk-4.la \
         $(GTK_DEP_LIBS)                        \
        $(NULL)

diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 9315e3e3072344018db0d8f71d870f13d3ef5b40..b8cbca3e12814714d40cfce9e45231d1af1f05bf 100644 (file)
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS =                                 \
 
 LDADD =                                \
        $(GDK_DEP_LIBS)                 \
-       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(NULL)
 
 #TEST_PROGS              += check-gdk-cairo

diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index b0a487fdcffe81abaa27b6f499985b0b9b3b27d6..aac128e90bd63258d75f6264172f2c1391ca2412 100644 (file)
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -21,7 +21,6 @@ DEPS = \
 
 LDADD = \
        $(top_builddir)/gtk/libgtk-4.la \
-       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)
 
 CLEANFILES =

diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 44227dcc8303e629e901d6c49f08025d0624340c..f5d0a5bc636672f9f0ea7c31eb0259fecf32e580 100644 (file)
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -43,7 +43,6 @@ endif
 libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS)
 libgtkreftestprivate_la_LDFLAGS = $(no_undefined)
 libgtkreftestprivate_la_LIBADD =       \
-       $(top_builddir)/gdk/libgdk-4.la \
        $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(GMODULE_LIBS)                 \